Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606#246

Merged
mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge
Jun 25, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606#246
mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* f7d733de - (origin/202605) [dashhaorch]: Update in-memory ha_role on HA scope set (#4659) (2026-06-25) [mssonicbld]<br>```

mssonicbld and others added 2 commits June 25, 2026 04:13
### What I did
In `DashHaOrch::updateHaScopeStateForSwitchOwner`, log a `SWSS_LOG_WARN` when the referenced HA Set entry is missing, and still proceed to update the HA Scope state DB. Early-return is now taken only when the HA Set exists and its owner is not `HA_OWNER_SWITCH`.

### Why I did it
Previously the function returned silently when the HA Set entry was not yet available, making it hard to diagnose why `DPU_STATE_DB` HA Scope state was not refreshed.

### How I verified it
Built locally and reviewed call sites — `m_ha_set_entries.find()` is guarded before any dereference, and `m_ha_scope_entries[key]` is only reached after the entry has been inserted.

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld
mssonicbld requested a review from prsunny as a code owner June 25, 2026 02:07
@mssonicbld
mssonicbld merged commit cf88cb1 into Azure:202606 Jun 25, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant